[automerger skipped] Import translations. DO NOT MERGE am: 21caa6f1d3 -s ours
am: 77aeea8219 -s ours
am skip reason: subject contains skip directive

Change-Id: I9e7cfc20513985b90a47e64b932fb8498b31b990