Make test 1946 faster
am: f98a38740b

Change-Id: I263e1c4eceb7bb2871f55e254cf3c05ba34d7201