[automerger skipped] Import translations. DO NOT MERGE am: 90a4fbf860  -s ours
am: 1a7eb0756e  -s ours

Change-Id: Ib6807148644c849255f93d30dafec0197fa28fa8