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

* commit '36befb2dbce9b05ce1cf26ee9aef5c268d6c7266':
  trim and strip html tags for load safe label name

Change-Id: I630902aad16a71485506628625bb3b9c09b992f6