Fix BindWidgetTests. am: 6ed680258e
am: 7cfab69b1c

Change-Id: Icaf64c61ccd354b41e5cd0ed84059147c157ad8b