Merge "Fix breaking test" into qt-r1-dev
am: dc40ca591f

Change-Id: I17fbdab3aea1f1c6f9ab771f7e476ba87cb2b121