CPd from master so we can update the website. Test: make ds-docs Bug: 65213121 Change-Id: I5bfc7074a42ec0ef5cd624b0bb72234e072684d3 (cherry picked from commit d4012d65)