Merge "Merge "Add core scoped storage host test to test mapping." into mainline-prod am: 72c4151616"