Merge "Remove bionicbb."