Import translations. DO NOT MERGE
am: 80d87da085  -s ours

Change-Id: I7b560ea83669c408725cf2e7d6e1a7c3d7eb191f