Import translations. DO NOT MERGE am: eda3322d78  -s ours
am: 338eccc50b  -s ours

Change-Id: Ia822015ca8b5c624d5cdf9a583ba4294411c1693