Import translations. DO NOT MERGE am: 30b5edfd23  -s ours
am: 4b6ec5fc6a  -s ours

Change-Id: Ic842d3d523fe0d30d7eea7f389862a60fd18a062