Import translations. DO NOT MERGE am: d51baf20ba  -s ours am: 0c53685bb9  -s ours
am: e1219bfbcc  -s ours

Change-Id: I19b48a1144ecf9392accc5b0648fb815646470b1