Merge \"Fix bug where process whitelist manager state would not be correct.\" into nyc-dev
am: a39d380651

Change-Id: I78f5a67a6b08f1275c66b7543e91b2bd016d621e