Changes according to code review

Change-Id: I5fe2e8682aff8d42b8861369d4bf69b471f11a1f