Merge "Remove availability definitions for mbs APIs."