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

Change-Id: I3145ec152a52aa552114b6fcf4f1e02ec24bd42f