[automerger skipped] Import translations. DO NOT MERGE am: 7a51bb5a4f  -s ours
am: a9e343721c  -s ours

Change-Id: I6f1ffc1e73dbfde0b13a0917a16a82d4efa06a70