DO NOT MERGE - Add flag to turn on/off the headless user specific blacklist/whitelist am: 81ce02f510

Change-Id: If9928abe6f7af3f9ef2d4ba4375983a067357b76