DO NOT MERGE Stripping some new widget API that is yet unused

Change-Id: I7a7156f30aa9105461908f66426950d13eb01408
2 files changed