Merge "Make sure dvr functions are prepended with dvr" into oc-dev
am: ad0a84fd2a

Change-Id: Ib72c00def4a8d4e43a3873e63744f09854e237a8