Import translations. DO NOT MERGE am: 4cdc225ade  -s ours
am: e665b80e18  -s ours

Change-Id: I8a2250b923802adff9f77442eb3becfb83e85172