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

Change-Id: Ibc9c4677e1f8c38bddaf65e56dcd0993af4db184