Merge \"Fixed whitelistManager assignment.\" into nyc-dev
am: dea7aa0da1

Change-Id: I3ba91e222cf0a04e2a08bbefc7d0aeea20485bcb