Merge "[Device] Remove build warning about comment"