Merge "Only measure each UID once in InstallerTest." am: 32aac7b9c9
am: 7b6d21b37e

Change-Id: I99a0c70e339a75da752be5dfb141b6835ca83cb3