Merge "Update Support Demos to use their own search icon" into nyc-dev
am: 11ba1f89cb

* commit '11ba1f89cba3ae135e9e091dc3e77601e7c10804':
  Update Support Demos to use their own search icon