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

Change-Id: I5a32640d7d793773b9cd04f8c9d2fdbeae1d8f37