[automerger skipped] Import translations. DO NOT MERGE
am: 67e8c15daf -s ours
am skip reason: subject contains skip directive

Change-Id: I2ea478a14f3b13d108bde83f8116c0a90b947f22