Merge changes from topic "developer option for app freezer" into rvc-dev am: ce9b47859d

Change-Id: I0f51b85fe07f5de34f9f701d128dbfd23e2c3d01