Add review fixes

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