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

Change-Id: I452e02910cd63cc1662daf9960e76909ec976835