This is a quick follow-up release to 1.9.0 because it contains a correction for an error made in the 1.9.0 release with the introduction of an unneeded constant. Change-Id: I4af9e7dbf760c9ad6dc50938e7f3dc6410b98190