Import translations. DO NOT MERGE am: 9118468aad  -s ours
am: 0b341de56a  -s ours

Change-Id: Iaa413e0cef9e8e2c23aa03f615c9e0565f136a77