track local support for bootable_recovery, update branches