Import translations. DO NOT MERGE
am: 7c359e3894  -s ours

Change-Id: Ie55d1ae9d2c03e06d9ce661629c3d0da1e3c2d69