Merge "Fix in Modem Activity Info updates" into pi-dev
am: 1231b7016e

Change-Id: I17f051c1f76a5e483dcc2b9ef99bda981319810e