Change #195560 fixes the test. This reverts commit 1c58d698. Change-Id: Idbfb0c5d2fbc1796f7dd1056181b5fc912a065a3