am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API...
am f4865efe: am be8bc839: Merge "DO NOT MERGE Stripping some new widget API that is yet unused" into jb-mr2-dev
* commit 'f4865efe':
DO NOT MERGE Stripping some new widget API that is yet unused