Squashed reconciliation with cm-12

Change-Id: I6881d463ba5e39aaba80bdbf3bcad19334336709