Also improved file documentation. Change-Id: Ia5a383110769cf51603305dc639616d904ebbab2
Change-Id: Iaa546fc5a30dad4bc0a0dbd0dc18dd2e05bf9d7f