Modified to address Gerrit reviewboard comments