Merge with CM

Change-Id: If57f86f618f0182eee5e5c59799a272df6d7caad