Merge "Update/Add method on InfoMediaManager" into rvc-dev am: 0b4de66f am: 504c4fe1 am: ece030c7 Change-Id: Ib4aa803c9cd452dedd851ebd0d4c19f5a0c4b46e