Apollo: SK translation

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