spring cleaning: shieldtablet

Change-Id: Ib80ecf8e0517071e5d8d55ae0ae29b18deb5f002