Merge "Merge "Move CtsScopedStorageHostTest to group presubmit-large" am: 33b19a2507 am: 4e5452499e" into sc-dev