Build: Aligned to CM

Change-Id: I1a1fcc7c524915114c8d7c28e7fe2cbc560a957f