Fix more broken tests am: 3f54d49723
am: 5994e3bba9

Change-Id: I26ac83828f6ff740c755dae4d3597bc449e473da