Import translations. DO NOT MERGE
am: 17ac212e00  -s ours

Change-Id: I2facb01e57d6fa68ef688b3772a479adc55d9972