merge from android

Merged zeroleak requested to merge android into master

Merge request reports