Re-commit 0fc492b5cb36bbe3b33d4ac6cc9382fb5a3cf719 since it was reverted accidentally by 73a1837bc873a65ade5e6dcc863e7749c189f77a
Re-commit 0fc492b5cb36bbe3b33d4ac6cc9382fb5a3cf719 since it was reverted accidentally by 73a1837bc873a65ade5e6dcc863e7749c189f77a

inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service,inbloom/secure-data-service