ESTORE Changes

These are the code changes for Estore / EBPI application requirement for
FAE