And fix existing warnings so we won't fail the doc build. Change-Id: Idec00e3f458b4f87c2e76e4d95971ed52dd6f837