Backport CM commits.

Change-Id: I0afe5a6f5a1f17f92e615ef79fa6e52226c40522