[automerger skipped] Import translations. DO NOT MERGE am: 5a4269d21e  -s ours
am: a553a09700  -s ours

Change-Id: I22b8a5fd5b6b1f4c9a1c03ae3161f6993721e74c