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

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