Merge "Only updating the header if valid bounds are generated." into nyc-dev
am: 47702be

* commit '47702be9b53b65d26da8c01a0ed34978571e846f':
  Only updating the header if valid bounds are generated.

Change-Id: Iea0fd168ff5b700c231e7d6c663a12665d391f5e