[automerger skipped] Merge "DO NOT MERGE Fix crash in case of no overlays" into pi-dev am: e8a1e7a423 skipped: ea7b5d8020

Change-Id: I73708c52edf65365e4bf961b51211710d05bfcdb