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

Change-Id: I941e745a832cab23f01601805ef66d5e73d0ce7f