Small typos

Change-Id: Ic84f4c6facf7f30f2a67641140333cbe6dda5b12
Merge remote-tracking branch 'aokp/jb-mr1' into jb-mr1