Merge "Fix broken MediaSessionManagerHostTest" into oc-dev am: f4bdfbd986
am: 8658e66ca3

Change-Id: I81319565bccbb9f7a2c1109dfa8e20db5759136c