Add check to test for corrupted or empty overlays am: c38931bd4b
am: 164097e751

Change-Id: Ia802137b72255dc8b0f791f97d9dbecddec5b01d