Merge "Invoke Changer" am: b2bedf41a6
am: 54ae481fa8

Change-Id: I9d619ddc9b0c1fb04b36d6413b55feceeb089e9c