Run in a shell

Change-Id: I051dd81b7eba28f3af0c36e13363afb1b18d1290
Merge "Run in a shell" into production