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

Change-Id: Ic13deea5422717e3ffbcaf5bca16c4969e70443d