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

Change-Id: Ifcf61e6495d72f0093af8606f94f073aaef264b2