Post review fixes

Change-Id: I27cdcd13b2b85df88196a3b9bb8a7ef0365c0741