Merge "Fix build failure when tizen-maintain-online feature is enabled" into tizen