Fix ds docs build. Reverts change-id I49caefc495e91ed896b90626b9ca0139dd39a271. DO NOT MERGE.
am: 501c270151

* commit '501c270151cb5b026d83c264eebf2cc5c84db8cf':
  Fix ds docs build. Reverts change-id I49caefc495e91ed896b90626b9ca0139dd39a271. DO NOT MERGE.

Change-Id: I58f49a4b0d3131c1595a577144a51e951336383e