am b4198f29: am baf4543e: Merge "DO NOT MERGE: media: CTS workarounds for...
am b4198f29: am baf4543e: Merge "DO NOT MERGE: media: CTS workarounds for framework bugs" into lmp-sprout-dev
* commit 'b4198f29':
DO NOT MERGE: media: CTS workarounds for framework bugs