Merge "Adding simple test for PlayerViewHolder construction" into rvc-dev am: 193bb8b040 am: 89724759c7 am: b81ccf9376 am: c3d750e817

Change-Id: I898f459293679400155c4da0cf5974187805bc3f