Merge commit '98241fad66813d3256d8dc6180b94253c3845533' of sso://googleplex-android/platform/system/media into HEAD
Change-Id: I219b6d8c69c842e32575b376e268c8d44c9729a5