add more configs
merged with master
Added whitelist for Android