Merge changes I23cd2206,I29579db7 into integration

* changes:
  fix(lib/s2tt): change assertion condition
  fix(lib/s2tt): fix S2TTE_INVALID_HIPAS_SHIFT macro