Merge "Remove use of REMOVE_ATB_FROM_BCP"