Some minor changes

Partially implements blueprint docs-for-v02

Change-Id: I95895d07994be9deb4dd1f2509cf6ffc0875a432
Merge "Some minor changes"