Revert "User Device common from CM"

This reverts commit c1288efd93b700e480e34e545f1d903c83afa614.

Change-Id: Iba3d322eb39850715b099077b2f6b92aa6ffca69
Merge "Revert "User Device common from CM"" into kitkat