Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9
am: 30680c6506

* commit '30680c65061777a6eaa4a19e195567765bdb6b6d':
  trim and strip html tags for load safe label name

Change-Id: I13347f68eba49563974e5067eb9997b20ac0b5cd