Merge "Undo a fix and de-flake a test"
am: e5a02966d8

Change-Id: I1f7d14d2eebee431aafd6c1f38aae8705cc0a321