Add more stuff to the whitelist

Change-Id: I9553465d85d7bdf1c0622798af61eecb130d10d9
Merge "Add more stuff to the whitelist"