Merge "Merge \"Added checks while unfreezing bounds\" into nyc-mr1-dev am: b59b5a679a" into nyc-mr1-dev-plus-aosp