code review feedback

Change-Id: I9d56be4c01f73b28df2714c81ef68ce543fe1cd8