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

Change-Id: I11025b233e64aadfe1a0860bf0abb3bc9237358a