Extend 952-invoke-custom to test invoke-custom/range am: be52a17c0f
am: 46c25d4fd4

Change-Id: Ifa7b7f54587fa9b7feefac3f86cd0c3e87cba06e