Import translations. DO NOT MERGE am: ff4edea1aa  -s ours
am: e897e1f74e  -s ours

Change-Id: Ida486e946fb171fa414337d1d13f4100e692488a