Addressing code review

Change-Id: I46cce161fc7ee718e6422292925ff683db9e0ab8