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

Change-Id: I000dc2b4149418504ab7fdd32c3d97b3411657e8