Merge "Fix NullPointerException in MediaPlayer"
am: c7c899bbe2

Change-Id: Iff261e6bd78c4f757ee0f7ae199710c9f92f0778