Merge "Fix more broken tests" into nyc-mr1-dev am: e32d0275d6
am: cb393259e6

Change-Id: Ib559c1fc4e2303b4ca819c505d83c9c0bf2637f6