Merge "[SystemInfo] Remove build warnings"