(cherry picked from commit 57be7313c4)
57be7313c4
for the moment we just make sure these two can be built without visible errors. (cherry picked from commit 2eb62014db)
2eb62014db