Import translations. DO NOT MERGE
am: 74631d4581  -s ours

Change-Id: Ie458c86649a1063df9ce91566ee301c1371d7155