Merge "Add dependency to legacykeystore." into sc-dev