Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e549 am: 1e29180890 am: 767341c7d0
Change-Id: I357ee9aa416a6c35fbe665a79f8556d0e3823fab
This commit is contained in: