Merge "Fix missing receiver type information in invoke-custom"
am: b512d6c9f9

Change-Id: I38fe85b7170f2999f6155dfc5ba249165ec84290