Test: make ds-docs Bug: 36948822 Bug: 36946883 Change-Id: I4de699dc7d5a69e456b0656de890f76b9787aafa
77edd5fabe