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

Change-Id: I2822506343d0463160e0d4c9fddcc818a8109c6c