media-caf branch

Change-Id: Iad976cdf0934bba1e0b8e7f223ac94d0df6fe497