Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 am: 2f5c9972c7 am: 147eec6e02

Change-Id: I2416955416acc260644d43ccc6b34bf8df1ce3a1