am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev

* commit 'b310c8945330a0a94abae34451e0bdc227f52035':
  Fix issue #22802691: APR: NPE in ActivityRecord