[automerger skipped] Fix flaky test with enabling virtual sd card fail am: 6926437d17 am: c05c867d0c am: f0d4a19058 am: 970743d215 -s ours
am: 0745d01a68 -s ours
am skip reason: change_id Iccb9e16650963c792d83c4fd89c43e5c2f6c7300 with SHA1 49f44124d4 is in history

Change-Id: I92b5a7effea7cb3e920589095383f77ad5522f4b