Merge "Merge "Fix flaky test" into qt-r1-dev am: 7bfbb7e0a7" into qt-r1-dev-plus-aosp
am: 81050d99dc

Change-Id: If91ea87ecfb65d8cdf3b75c3af1d1ebaedb0db35