Address earlier code review comments

Change-Id: I4d369ba153676d0990dadf9b1269506607adec7f
2 files changed