Merge "Fastboot changes to support A/B partitioning"