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

Change-Id: I96f0fe4c87ca676f91b9aa6aecbf0770f7f23001