[automerger skipped] Merge "Fix breaking test" into qt-r1-dev am: dc40ca591f am: fd806b21f0
am: c9937dcc32 -s ours
am skip reason: change_id Ic1a937d3d81f4386ae744109076935921da9591b with SHA1 bea18f7377 is in history

Change-Id: I24609f488239f8d97e0470beb3932c23e453c740