Manifest: Aligned with CM

Change-Id: I1129a642cba739863626837644fcd62e49603cfc