Import translations. DO NOT MERGE
am: 9a4ff5a900  -s ours

Change-Id: I19ed28ded9e92d54b060d0a944cf318a0f1a4984