Merge "Add compile-time errors for HW_ASSISTED_COHERENCY flag" into integration