am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change...
am c7322005: am f9b41efe: Merge "Don\'t include flags in configuration change if their value hasn\'t changed."
* commit 'c7322005':
Don't include flags in configuration change if their value hasn't changed.