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

Change-Id: Ibdfde21de24e9aa8d6606bf02a3c3d3524c4c10a