Merge "Protect against assumptions of a top focused stack." into rvc-dev am:...
Merge "Protect against assumptions of a top focused stack." into rvc-dev am: 495fd8e5 am: ef310351 am: e1a7391c am: 4ad02bca am: f87b2560
Change-Id: Ia6ba1f047fbfa471d988490e12aae72083f27f16