partially pick "Updates for new Widgets" from upstream

Change-Id: Ibf93a8e53b7ece158acb97b0b9e02e0034fd61ef