Bug: 172870110 Test: test-only change Test: new test passes 100 times in a row Change-Id: I210284578e38cd25b8b95235d3390d5bd66a5a70 Merged-In: I210284578e38cd25b8b95235d3390d5bd66a5a70 (cherry picked from commit a9aca9744745b7fc8b3d2a1235096982ad8ec8b6)