74339f6da2
Addreses the minor comments in commit 74339f6da2 Change-Id: I8c83bbc07c2d678b0ac24eb4e25e231285480ace