[automerger skipped] Import translations. DO NOT MERGE
am: efc7ac061c -s ours
am skip reason: subject contains skip directive

Change-Id: Id1ff8188cc1638770dffc0d2f3eabbbd5660b73a