Merge "Merge "Invoke Changer" am: b2bedf41a6 am: 54ae481fa8" into oc-dev-plus-aosp