Merge "Remove Bootstrap Related Dependencies"