Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev