Import translations. DO NOT MERGE am: e93b21e090  -s ours
am: 344a27b5ed  -s ours

Change-Id: Ia6e98ade3553d129dd73333ef1f285235471f10c