Merge \"assume a generous prior in the rate estimator\" into nyc-dev
am: fddf5df01f

Change-Id: I4a526dd0467a6f57e9e919817f87d643071ae81b