code review feedback

Change-Id: I0cdc80370c1a186f54812b99020f896522c653b5