User Device common from CM

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