Import translations. DO NOT MERGE
am: 3e31ca0fcf  -s ours

Change-Id: I97dcd4a7a82aaeb1eccd20beadd331fa4bf0b5ef