Import translations. DO NOT MERGE am: 6a765bc8b2  -s ours
am: 1eaf75cd1b  -s ours

Change-Id: Ia6a4dbd3ea27d0d5e1e2d0ee558a5eb6d21c6feb