Merge "Fix broken and flaky unit tests" into nyc-mr1-dev am: 005710d242 am: 30c72903ff
am: ea8a616ab6

Change-Id: I71c7df509f238647a6e84e9511384b6f2c11deba