Merge "qc refactor part1" into honeycomb-mr1