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

Change-Id: I37468179ec0c5b6f7c047b7f4eb34f147fc70666