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

Change-Id: I232377db34183d34be3e934cd3410c020df22367