Merge "Remove IPersistentDataBlockService from system-api."