Import translations. DO NOT MERGE am: a35aef0df4  -s ours
am: 7f20e0ed63  -s ours

Change-Id: Ib62b3c7ecbc41a362d30c9180fc9f4e7789a12e4