merge in ub-latinimegoogle-edamame-mr1-release history after reset to dce0394e415850225b8b6c90befccf3958a6364f