Merge commit 'android-4.1.2_r1' into merge_branch

* commit 'android-4.1.2_r1':
  Handle keynames with special characters such as - and .
Merge "Merge commit 'android-4.1.2_r1' into merge_branch"