Add back CM Version code and Pixel Version (2/2)

Change-Id: Id7b6a8bbba1a879ad92cec658d9ca27eb0bef3a5