Updates for CM12

Change-Id: Id3b1d479ddc96eed37ae87079197201ec66e11d8
Merge branch 'cm' into HEAD