Align with CM

Change-Id: Id219505ffd9bc99ad6828fb668bf0934e75f5162