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

Change-Id: I245a084af19e6216e4c5b160e200cd03a1821be3