[automerger skipped] Import translations. DO NOT MERGE
am: 44f20dde53  -s ours

Change-Id: I6835a39377b01eb784b880e6cd3abe54ad216a4c