Merge "Get correct factory reset reason from encryption failure" into lmp-dev