v3.0.1
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Make sure to always remove in-flight pushes Change-Id: I574e150181d4cc63c8ebf6371b05093ee569c093