am f65dd213: am 2534c16b: am dfe0d9a0: Merge "Change order of operations so flag is not overwritten" into klp-dev

* commit 'f65dd213900603116c7b064bfdfb57662f7682c3':
  Change order of operations so flag is not overwritten