Merge "Merge "Fix failed test case" into qt-dev am: fb28f92f71
am: 08b3d016f4" into qt-r1-dev-plus-aosp
am: e0c0e6bc34
Change-Id: Ifed150482c261500fbb4f3da4df50da995022dba
This commit is contained in: