Merge "Also freeze configuration when freezing bounds" into nyc-dev
am: 7f303bced8

* commit '7f303bced8b7c1fe7f8e7f93de07106c5c610503':
  Also freeze configuration when freezing bounds

Change-Id: I07f8742b38bea83a7a6e177c5a70bf81608da560