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

Change-Id: Ic6c24431d91f9a70504b5b4f30da9f2281a74315