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

Change-Id: Ideb81a07d14e1fff71593cec822f3120c4f523f6