Import translations. DO NOT MERGE am: 76a81a9803  -s ours
am: cc6a61a958  -s ours

Change-Id: Ib1cd100a921d6f2f4a9dae2dca59b6e974218e03