Android Sensor merge conflict changes
Merge branch 'master' of https://github.com/saran87/RealTimePackageMonitoringandTracking