Merge "Force second measure pass when there is a configuration change" into...
Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8 am: 26a46271
am: c96a245e
* commit 'c96a245e':
Force second measure pass when there is a configuration change
Change-Id: Ic81ffd3b7ea102f8e4e72a3a6c5d779dfb1b009e