Addressing code review comments on previous change: 17180420 Change-Id: I2c9e0ce35e755c23d8292749828d15a87109d6dc