Import translations. DO NOT MERGE
am: 3aef9aef55  -s ours

Change-Id: I354951f8535a04f1f96152de6448f3e2e259a9f6