[automerger skipped] Import translations. DO NOT MERGE skipped: 6105ad5932 skipped: e50fc63e3d
am: 20ce1f4c33  -s ours

Change-Id: I78a7a1809236cb0867143d2c4deeddfbdc4e9a18