Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev
am: e8a1e7a423

Change-Id: I160e9cab3b4ebd4d5a39443b8ea3990a7943d102