Merge "Deprecate legacy and unused DVR API" into pi-dev am: d15ec65de8
am: 5b5f422671

Change-Id: I149a0b1408cd2c3f21da407c1694ab81ff9e1fc9