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

Change-Id: I7883afe033b9dede85d121e2548be03c36905c9f