Merge CM stuff

Change-Id: Ia2628ee4f8256f51d92693ec03552000bf4c283f