Bring inline with CM

Change-Id: Ie13965b76ab797b58fb713547ef8a586c73050e5