Improve docs

Change-Id: Id5849820056886eb54c57d74c8eab114b1beef8e
Merge "Improve docs"