Merge change 8138

* changes:
  MOTANDROID-9 (MP3 DRM playback not work correctly) RIO-6332 (MP3 DRM Playback not working correctly)