Clean up VRS related code for upstreaming

Change-Id: I4c1546648f8f48707772a5c3db1995554964da4d
Fix logging statements and patch restore.

Change-Id: I92c20c728d9f232c86c39373990cb39a38edce6a
Get the sizes right dufus

Change-Id: Ibe9d8efacd4570a7789d431331e2f7b45a621b55
Merge pull request #97 from awong-dev/vrs_cleanup

Vrs cleanup