Merge "Use handles for GetReferringObjects"
am: 000432d9a4

Change-Id: I1d778b91f0964b562e06d9e898dcb68e8dedb3fc