Move to common

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