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

Change-Id: Ifc9bb7da8d954b019e702c0566609e38190ef15f