Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf Issue #20: Address peer review comments from previous commit. Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf Former-commit-id: 47750dfd5e387238f409ead55549cbb24f5afbe1
Former-commit-id: 926a2a6a5af5b3514c29097deb0fc24b093643a2
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f