Merge "resolve stage dir before validation" into oc-mr1-dev am: 40f9beb589
am: 1e2855971e

Change-Id: Icd3b0a097b2e603f02b7104942c83e013a119877