merge in master-release history after reset to b8805e75
The Android Automerger authored
f1d61a29