Merge "b/2293263 Finished removing busyBits references."