[automerger skipped] Import translations. DO NOT MERGE
am: 52b3a450bc  -s ours

Change-Id: I224bcced6d0e236a470780aedf72bd1a96487bce