Updated from global requirements

Change-Id: I382fee8cefdf23c2b5b307f7022fc197f09aac77
Fix broken docs references

This was broken in the api reshuffle.

Change-Id: Ice9ad64b31104a928d1bebc048cd507acb52a57a
Merge "Fix broken docs references"
Merge "Updated from global requirements"