Merge "Remove tests for forced ephemeral users." into pi-dev
am: 9cabcc170e

Change-Id: I604f9ac384ecf6c1c0585282f4ce0fffdccafd5a