Merge "Keep managed profile keystores in sync with owner" into lmp-dev