[automerger skipped] Merge "Import translations. DO NOT MERGE" am: e507cc26ae -s ours am: 2c1dc76eb7 -s ours am: 6a7fd13524 -s ours
am skip reason: subject contains skip directive

Change-Id: I857d6dff09a5e2f45d624b5076f3f1b21c2a69bc