Import translations. DO NOT MERGE am: fe3c094b2a  -s ours
am: 8098e50179  -s ours

Change-Id: I02e30a26803ffe6ffcb082c0c249e12f54b30d1e