Import translations. DO NOT MERGE am: c1bca0543a  -s ours
am: d11f95ad46  -s ours

Change-Id: I5694269c6761dfb06400d5164e587cf5677b3d2c