Import translations. DO NOT MERGE am: 2a2e8ce297  -s ours
am: 3ea5862bb1  -s ours

Change-Id: Ic7e86d0fc29124ff060e45a0e37e8f6b12b6eb64