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

Change-Id: I83692768459e259ac73d0f075c6792f059785655