Merge "Removed overlay from target" into oc-dr1-dev am: eb42aa7438
am: 2c0743601e

Change-Id: I09a1e9e9bb75e18cadc453cd3b9dfc07bb502fba