Merge "Fixed an error in invokechanger" am: c1bb1cd339
am: 2dbb7f7102

Change-Id: If91f9144282efb845bd136186c74e9b1fcf4c3ed