Jafier Bring up and CM Merge

Change-Id: I0c3ed051ba692c127f7472d8f8bb6a0e65c535f8