Import translations. DO NOT MERGE am: 4f0e401700  -s ours
am: dd0b783c29  -s ours

Change-Id: Iadb64979f5ed4d9eb143cab641878140b8c29ee6