am 4329c0d9: am 3c8cf226: am 0747145e: am 4bf70778: am 1eb613e1: am 3ece5ae7: Add whitelists for known address, port, and UID combinations Bug: 19461976

* commit '4329c0d9d0f911a3407fe73539ad4f2d4c335f07':
  Add whitelists for known address, port, and UID combinations Bug: 19461976