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