Former-commit-id: 3dd604623685cd5aba9e0a28001004cecef8d29a
Former-commit-id: c58e900204016e026c6023e7beb33bc82a6cdeaf
Issue #798 - Code review updates Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb Former-commit-id: cb05a9f95384806537106dc804833331d6c7db48