merge in master-release history after reset to 38a3f7de
The Android Automerger authored
39b5e8a8