merge in ics-release history after reset to master
The Android Automerger authored
72900ce5