[automerger skipped] Import translations. DO NOT MERGE
am: 994ae82c34  -s ours

Change-Id: I779083c8a8685a719d462160cfd8c8b4479a406c