Resolve dir path in early stage am: eba3ed1a97 am: e02550cfcf
am: 71745b43f3

Change-Id: I9d1a06fc474c872ef931a0ca3ce9a5275747b903