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

Change-Id: I1f3acdaf2455d318ea1ae1530d98fe627274e94e