Fix documentation references

Change-Id: Ie770ed7c2496fdfb2d3daa36a7ca9107bfc37a2d
Merge "Fix documentation references"