Merge "media: fixing klock work issue." am: 1b7026ed1e am: 6f2779da0f
am: 0b96fa14b8

Change-Id: I2bd06479faa495577a0aa5202a05894fee3b9691