Merge "Fixed an error in invokechanger"
am: c1bb1cd339

Change-Id: I2f5fe13ec7f9e52f6ab8ee7573051b6775b2e6a1