Add hopefully last batch to the whitelist

Change-Id: Id55203825633f0dbbcf22914a2e9a84f892d0a52
Merge "Add hopefully last batch to the whitelist"