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

Change-Id: I8d378f6c64bfe9a97941cddafe6c3163abc7a050