Merge changes from topic 'mediaplayer_gc' into oc-dev
am: f86d68d447

Change-Id: I01f8c26e9a61f8ed5dd6f0b3a12d245001756796