fix Event Bridge Inititalization: refs #1692
make store support android-8: refs #1432