Merge "Merge "Fixed the reference to the compat version of the widget. Revised the class description." into tm-dev am: 96d92cfe am: 86fec4c5" into tm-d1-dev-plus-aosp