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

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