Changes done during our review meeting.

Change-Id: I7f9f5ce087053da34deb3313d889c1830e8afaa5