Merge "Merge "ApplicationLoaders: hard failures & tests" am: 54ea3525 am: be708ba2" into qt-dev-plus-aosp