[automerger skipped] Import translations. DO NOT MERGE
am: bb9b24fdcb  -s ours

Change-Id: I727e12f4c18c7f6ad5f4f2e6622d8b4186bd68f4