Import translations. DO NOT MERGE am: 08fdb03e8d  -s ours
am: d03a71ab66  -s ours

Change-Id: Ia241f9869b3e17909e523e131861cf8ebe39aabb