Import translations. DO NOT MERGE am: a860e80b92  -s ours
am: 9cc0e28204  -s ours

Change-Id: I8e19c6ac68280a665ed4436451fd05b951083bdc