bug: 30972906 Test fails on device. This reverts commit d6f914ea. Change-Id: I53902b0d6d4dbe8237f61bf01542acf538229c71