More accurate function descriptions

Change-Id: I633a7740996b8933778aa32036cb429026f75ebe
Merge "More accurate function descriptions"