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

Change-Id: I2880faeab223755faeca64335b0eac8fe798ec80