changes required by QC HB.1.1.5-01410-8x96

Change-Id: I02cb70fa3525b5d087b2eb2d226a66bb16461a71
6 files changed