Merge "Fix build error due to use of BIT macro"