Reenabling some widget tests am: 599b1fc4d3
am: 9c524db4c8

Change-Id: I51e3f50bb7f923894250a8fd0643e630b60e1380