change to i337

Change-Id: I9e4619a69d5337fbbbdb3dc995a577dc987a5abb
fix typo

Change-Id: I4703a383616d1574e196265b1df54b6951e9948c
Merge remote-tracking branch 'cm/cm-10.1' into HEAD