address review comments, fixed typo

Change-Id: I035c86c1114d16d977cfbcb7213ae790301bbcd7