Bring up to date with CM

Change-Id: I142bbd2768e4d8a6f4f9bb6290151cd570812817