Merge "Add null check before checking overlay" into pi-dev
am: 5d1d771e99

Change-Id: I9ab7d738a4a32d1dcba566b0ce9cea0b149dfaef