Updates to allow execution on Android 8+
Merge remote-tracking branch 'origin/master'
Removal of Network based functions for the moment