Merge remote-tracking branch 'cm/next' into HEAD

Change-Id: I86bbc9b377ff9f99cdeda8e0f8303496ba3d60fa