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