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

Change-Id: I7b9425de720a1b310f642d81b5d902ae582395a3