Merge "Hardware Composer Test Lib HBlen off by 1" into honeycomb