Merge with CM

Change-Id: I3a070fbf523a32fc8a1a313cd099f89576854268