Potential fix for a couple bugs

issue 17371274
issue 17368590

Change-Id: I717f9c37613efd9d61e401540ca82aff77058022
2 files changed