Fix various docs and version numbers from 84a2f570

Change-Id: I03f7778bc93a255475aa132a09c6da15decd1549
Merge "Fix various docs and version numbers from 84a2f570"