[automerger] Merge "Making Guest ephemeral for the missed build targets." into pi-dev am: fb5ef1e7e7 am: f77abce5cb

Change-Id: I370ea4948948e21e999eb5503c720f032c1b9d08