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