Merge "media: fixing klock work issue."
am: 1b7026ed1e

Change-Id: I64a0b78762c88ead68647fa4c028f2cfb52e6bc2