Merge "Separate measure so it can only run inflate if needed" into nyc-dev
am: 3874597

* commit '38745971c266f5fca692ef284e1e3b4d38af1a41':
  Separate measure so it can only run inflate if needed

Change-Id: Id52cf5e5c211d8c0f2363e0e349669a1c1f4ca40