Add separate host and instance variables.

Change-Id: I9bd4d144b382a7f31ad05c062cb5ba5d04bad067
Closes-Bug: PROD-20985
1 file changed