DO NOT MERGE - Enable blacklist for headless system user am: f8c0b31524

Change-Id: I9da9ffcb0f8498b3a01295c23e3c78d4f85dbb20