[automerger skipped] Import translations. DO NOT MERGE
am: 5fb899d15b  -s ours

Change-Id: I3783dbceb2dd5524e3f45da7f109fb793834859f