Merge "Fix stuck activity" into oc-mr1-dev am: ab1760f50f
am: 449a8560fb

Change-Id: If08cfa4718d771d4b4622cc1afed76e1e5424887