Merge "Merge "Separate measure so it can only run inflate if needed" into...
Merge "Merge "Separate measure so it can only run inflate if needed" into nyc-dev am: 38745971 am: 1de566b5" into nyc-mr1-dev-plus-aosp
am: 5b0638d9
* commit '5b0638d9':
Change-Id: I978b607e1a6aba11dfbc39cc9b0cf7f399d579f6