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

Change-Id: Iae64d759c1fb74c6562cce6668ee6053f1bd58f9