Merge "Hardware Composer new and refactored test cases" into honeycomb