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

Change-Id: I3642243734999dffe29f17a974b64a0587e92e6c