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

Change-Id: I41243388e80f643ac67e0614efdd1cd8265fee3a