Merge "Disable factory reset for secondary users" into lmp-dev