Make test 1946 faster am: f98a38740b
am: 9f3f98a0dd

Change-Id: I51e10b0a79bcc6f398d180c38ae478c0e1008523