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

Change-Id: I0c0125cd0bf5eddc151bab6b2d467a996ea29cb2