Use HashSet for test 2005 am: f1ede367e6 am: e8a34e5834

Change-Id: Ia7fa0faa404886809c81d7bf1a28930ef38cbbcc