Merge "More dvr display test." into pi-dev
am: 7ea026c4f3

Change-Id: I15de307c5e9e8a9b9283bb0f0112a80b937348b4