Bug: 38526548 Flag: EXEMPT refactor Change-Id: I1016f5f812d8f0c43a2b3a899bd70b6672f44481
Bug: 377664066 Flag: EXEMPT refactor Change-Id: I79805c639197911d10f3632e50b5feced08c2fd6