Merge "Nits following invoke-custom support" am: 146e6139c3
am: b10ebc05f6

Change-Id: I98f3a7bd7cd1b8f1e7cd8f4ae0552d1943dc3827