Follow up on alph's review comments.

Bug: 675774
Change-Id: Id205217111e66f57ea1c03dce6b51dea78a08b0a
TBR:
2 files changed