[automerger skipped] Import translations. DO NOT MERGE am: e63659a8e8  -s ours
am: 27c67ecff8  -s ours

Change-Id: I90347203a52e4a07975cbf7e2174a9ff3888d34e