Merge "Fix NullPointerException in MediaPlayer" am: c7c899bbe2
am: 15c9c1f8d1

Change-Id: I313f483e69e098252cf1b753aa5f6b38945d9669