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

Change-Id: I7b0c723a19345b6269ce1c924c8e44994310d568