Merge "Ignore failed test cases am: b91cfcad60 am: 9e5f428580" into qt-r1-dev-plus-aosp
am: 77f547d996

Change-Id: I697f42f09ebabc775998b4a503bac3287e762f7d