Android m preview 1
merge in mnc-release history after reset to mnc-dev