Import translations. DO NOT MERGE
am: b2fc15f1f5  -s ours

Change-Id: Ib8063fa332cb5db44551a78f2ec11a74159f0d8b