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

Change-Id: I55d1631e7d6a53cc808b1892c6bc427f2f2cf5e0