Merge "Use handles for GetReferringObjects" am: 000432d9a4 am: 40bf3da1d7
am: b87e458fdd

Change-Id: I2963e1077f94f5020833ab4978583cdd582e15d9