Merge "Revert "Add TEST_MAPPING in hostsidetests/userspacereboot""