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

Change-Id: If3e6386d8b830dacca3a96725b33e08524a5d7db