Android changes tracking

Manhrequested to merge
android into master

This Merge Request is created to track changes on android branch only.

Merge request reports