Import translations. DO NOT MERGE
am: f8e5c53706  -s ours

Change-Id: I2f7cc37e6f05b0cccb2d53b14c26fbe356e8cc3d