Amend: Cleaned up comments and some bugs in code after review Amend: Rebased changes Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d Former-commit-id: ab74da7808aa343983f532ee076820c7e63fdded
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f