Improve MediaBuffer robustness for remote clients am: 9bd3c9b0e8 am: e2538f2f9b
am: ff97bcaf88

Change-Id: I97a2b06342b90949b489f72b9165fe618479fd82