Test: make ds-docs Bug: 111734031 Bug: 111734470 Change-Id: Ic120368fef0c0673ce954cdf0927a4705b3edcd2