Import translations. DO NOT MERGE
am: 379b935e2e  -s ours

Change-Id: Id7eae2284f2cb250d1f0b922cf77a5c666e2c8fc