69a9346b07
Test: locally tested on Tangor Flag: EXEMPT refactor Bug: 397942185 Change-Id: Ib2c3b2662413d15926215c18421168e93ce2b117