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

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