[automerger skipped] [GUP] Hard code the name of the whitelist file. am: be09eef8
am: 7d1d0c4f -s ours
am skip reason: change_id Ibe9337b358b6a67600048f1661d73574d7bea607 with SHA1 3a1be746 is in history
Change-Id: If342de345315b97a79917fc1a8a59c94f58eb7d5