am baf4543e: Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev

* commit 'baf4543e8950c4430647ef65f62274eba121dd13':
  DO NOT MERGE: media: CTS workarounds for framework bugs