Address my review comments in Ibf59342e

Change-Id: I0d7b3fde35d12fa60b33180effb6da664f548eb7
Merge "Address my review comments in Ibf59342e"