[automerger skipped] Import translations. DO NOT MERGE
am: 4acf712d63  -s ours

Change-Id: Ic257df5d5d42bc35ff3b1ff9f74716255de0f08a