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

Change-Id: I74f15490d9a71386230fd6f326bd0a1866c7f7d3