Merge "Fix broken tests" into qt-dev am: 1115d61c0b
am: 4ca871a8bd

Change-Id: Id1599af2007f7127b65ac6d1ddb4f6bd62899976