Merge "Add 1946 to gcverify and trace known failures" am: 39860251a2
am: 171a3dc769

Change-Id: Ib1425a9169c1bd1fe2386c2caa8af0f5dd2177df