add review comments

Change-Id: Ifff72a370011b01d24471eca16724b77c4d301da