And then make the tests pass Test: atest Bug: 127341023 Bug: 130205844 Bug: 128599467 Change-Id: If4b4f82c95945edd87d57fe52fb78658c2b58471