[automerger skipped] Import translations. DO NOT MERGE am: 07e7aae097 -s ours am: bac44f5627 -s ours

am skip reason: subject contains skip directive

Change-Id: I13ed91eb27cb7cef027e3668a2aea6b0f47a261a