am a6292fc0: am 519f7918: am 797b22f9: Merge changes to chips from unbundled branch: update behavior to match new ux spec

* commit 'a6292fc067663f2d5e17db924e595f02299790bc':
  Merge changes to chips from unbundled branch: update behavior to match new ux spec