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

Change-Id: I735703d90c9b92772da0d323d2517c211f5817fd