[automerger skipped] Import translations. DO NOT MERGE
am: 33aa180429  -s ours

Change-Id: I99cb25bf5d0bbd3f1d731097f645f660c46c158a