Merge "dx: Fix doc build warnings"
am: a8a0f3bfe2

Change-Id: I5b88f33cac0f00bddd1d2fb15b589228a6ac9521