Merge "Use Material as the base theme for Widget tests" into pie-cts-dev am: 0fb311fc5a
am: 8b2d60bcdb

Change-Id: Iade741f0c776cc0b892f45b9d89cf984d7a80262