Two minor logic fixes

Change-Id: I1d5624fb2f34f87a55613036851034ec7c2d0b76
2 files changed