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

Change-Id: I68667b5fd3777621b425093da0b64106f6dfc09c