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

Change-Id: I3754163cd570575d6755dd48ed2db594f0497c9e