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

Change-Id: I221d07df46d39716382c8d1787066393f98a6252