Merge "Fix flaky test" into qt-r1-dev
am: 7bfbb7e0a7

Change-Id: I78842caa898ca19b7a0ba27f255d7ee27e906eac