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

Change-Id: I3db1ef61bf220cc62d1d0a8e4a96aee357216b58