Merge "Fix missing receiver type information in invoke-custom" am: b512d6c9 am: 8b833478 am: afd31750 am: 233abcd9 Change-Id: I38fdcd4134c48c03ee506dbbc318a33ef5f2b651