Merge "Merge "Fix Flaky MediaPlayerDataTest test." into sc-dev am: 0bec3aba am: 7b5139d2 am: 23d2d540"