Merge "Wait for idle to resolve flaky tests." into rvc-dev am: 1259868c64 am: c386231b90 am: 76ea2c378e am: 71ff1740cc

Change-Id: Ie2a11441f5dffa4f7bd3f31f0ff0c10ceefdab94