[automerger skipped] Import translations. DO NOT MERGE skipped: 74af8e024f skipped: b763502d6b
am: 92048f7609  -s ours

Change-Id: Iacf08c21a51bcbf8bb479fe0734f3a33ea43779e