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

Change-Id: Ie6ef0976314c5f3820a20767bbe1c10ade3c6052