[automerger skipped] Import translations. DO NOT MERGE am: 322c6728a6 -s ours am: b9af6b1732 -s ours

am skip reason: subject contains skip directive

Change-Id: I4803d1caf59844807270a75dcd7c4c039ac4875d