Merge "BQ: Conditionally compile validateConsistencyLocked"