The classes were recently changed so provided this is merged before next branch cut no need to worry about cached HTML. Bug: T249073 Change-Id: Ib20c7a359bda858df89ebb245e682d321dd5acd0
Bug: T249372 Change-Id: Ib6ae191b31564dc23a3b1d6aedf48cbaaad006af