Import translations. DO NOT MERGE
am: 36fef8afb8  -s ours

Change-Id: Ifc1a41ec55d3a83f2c1c71ddec0715ab7b466c99