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

Change-Id: I549c9f9cd3745f03f50c9b44cc5b710c10994f40