Import translations. DO NOT MERGE am: 6d0128a056  -s ours am: 779170d5bb  -s ours
am: 200e1ef67f  -s ours

Change-Id: Ie622431e482477bbe677946a0bb17a84cdb8c387