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

Change-Id: I3b50c6616ebf92e500d3f3b607d519b2be282f62