Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2 am: 15c9c1f8d1 am: 80713e98f7
am: cec9c42498

Change-Id: I19ca9ac969eca57981fd00dcc89f6fa1c724650a