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

Change-Id: Ie5506fa108c8d65ecbeb96a1289bf9850fe76924