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

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