Merge "Fix some failed tests" into qt-dev
am: a7e0e5d82a

Change-Id: Ieabd7071170632f4cf4038b9b811bd800a60125f