When using su - we have to explicitly set cwd

Change-Id: I872baaf2103d21b25bbba676ce8c216fdda6bc74
Merge "When using su - we have to explicitly set cwd" into production