Addressing a couple comments on previous CL

Change-Id: I6ee066a5e6c2dadff921bb2ed7e91ea2601eec05
2 files changed