Fix typo

Change-Id: Ib6c4b20030497b963390fe744e0a6620ace42f19
merge changes from remotes/github/cm-10.1 into master