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

Change-Id: I2b70059cc6735bfdf3fd60f4837b413f8966c637