Address comments on commit 498944

Bug 15779911

Change-Id: I68ea7be682696efb40ff3bfc0ac615466402c8db
1 file changed