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

Change-Id: I7a85fc2f3ae07f59a6d08ce13568546d4d308d18