Fix typo

Change-Id: Ia12ca4bd98c8f18a34af95b642e74196ea81fa19
Signed-off-by: Kevin Liu <airk908@gmail.com>
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0