Merge "Merge "trim and strip html tags for load safe label name" into nyc-dev am: c16bc88fc9 am: 30680c6506" into nyc-mr1-dev-plus-aosp
am: 4ef21b0c1d
* commit '4ef21b0c1de641a2019997f58d91cdf6fea1853a':
Change-Id: If335a97678bf5fee0465389bad3aa8f9db3dc2d5
This commit is contained in: