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

Change-Id: I6062d04e1402dd9bf44b8376c533cb76c83d66bb