Add owner/vm/container fields for TerminalParams proto am: 2e61850939
am: 1a4737933f

Change-Id: I3d9864df8f9e77c9dcfae4f0a40fea4cd88a8503