aosp-stable: Enhance the push