Merge "Do not gate bypass on isHardwareAvailable" into qt-r1-dev
am: 545bd4dee3

Change-Id: I7eaad01e358e7b7bdbaaf31c772210983248f8dd