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

* commit 'f9b41efe17718a21df115d95c47a94d97a767076':
  Don't include flags in configuration change if their value hasn't changed.