Android 6.0.1 release 4
merge in mnc-dr-release history after reset to mnc-dr-dev