Picking commits for facebook email and elasticsearch exception from leevia branch