Add review fixes

Authored by Aditya Atul Tirodkar <tirodkar@google.com> on Mar 20 2017, 3:33 AM.