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

Change-Id: I47cdb04f247bcba41cd3d05d66bf102cd86a0be2