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

Change-Id: Ic2fff0bfcc91ba5e791f0a4986fa854e866534e0