Rework for common device repo

Change-Id: I723cad9b3655e5a307cf7e770e4ba17f755893a1