Merge "Ensure null media player does not crash Telecom." am: 3f3349b92d
am: dca10da849

Change-Id: Ie0a48ba94d0ebb06758d09501497011d473a770a