hacking 3.1.x is too old. Change-Id: Ib258cfd4c23bc0cff9ad52e7f967953d9e99b60b
Removed babel related things - we're not expecting to have translations. Change-Id: I510195c6c83c99d78c90571ff0fdea8219833d95