Merge "tpm_manager: Change location for owner password data"