Merge changes from topic 'fix_broken_overlay' into oc-dr1-dev am: 4b535d93f7
am: 150123dbb7

Change-Id: I39a1e974135b963d182e53cc332b99507ed173c8