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