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

* commit '5ecb5d76ab07d16f38ae1fab63f8fdf09cfbc0ca':
  Only updating the header if valid bounds are generated.

Change-Id: Ia02dd5846f3f49952986a7e645245de1b79ca2f0