Cleanup and optimization, updated changelog, added p4vzw to roomservice.xml for a trial build

Change-Id: Iaa8112581d54d01f5c3a7896034e00eaf65a2b0c