Post review comments

Change-Id: I804cf427251fd22c4317e5b5a457e73476b59651