Import translations. DO NOT MERGE am: 69d5291070  -s ours
am: a93d93a2d3  -s ours

Change-Id: I2a96f26b713beb0fb3db0e1fb94b63129a6dee5c