Gentle carbonization

Change-Id: Iaed720357bc510ebea8b5b1d486a3d6221d0c0dc
caf audio

Change-Id: Ifd69ba5de07691762060180427b468f5af4c58ac
Merge "caf audio" into jb42