Merge "Fix some of ExternalStorageHostTest tests on secondary user."