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

Change-Id: I80613c2fa0ded16c846a8168e44c7f3f30e15d99