Bring up to date with CM

Change-Id: I1c6bd6eaa4be082ae4577b4b4d083b8e5fb2509b