update get per review comments

Change-Id: Ifae93e87e975133e750997f2d08881097c756698