Fix overlay issue

Change-Id: Ia22cdef07bab8ac0642ef3afba5cd1819f6a8562