Move to common

Change-Id: I604ee237b3687eaf02d9ba60f977a3a7df166f33
Merge "Move to common" into cm-10.1