Refactored to use inheritance and separate logic where possible. Addressed comments. Change-Id: I9e62414cd83121575bdf99a3b47466a7585bedb6 Former-commit-id: 17196b5dcd [formerly 6e015b3f61c20635077d6e8271e9b763e5a32fe1] Former-commit-id: dbba727f3d
17196b5dcd
dbba727f3d
Former-commit-id: 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81] Former-commit-id: 31ae7ea218
79ce6cfd97
31ae7ea218