Merge "Run EphemeralTest on current user." into pie-cts-dev
am: b00497fc7c

Change-Id: I12957f8318885288601be8a5ece8fff91aa07b6e