Bug: 136616503 Test: refactoring, check if existing tests pass Change-Id: I627832b2e8f964dbabbf95788279e437c4347adf
2f54cf120e
f44f4f9832