Import translations. DO NOT MERGE
am: 3739f191c2  -s ours

Change-Id: Ie1a5d3a490623dca3927b67ba1c8987bff818de9