[automerger skipped] Merge "Remove storage sandboxes related code." into qt-dev
am: cf4052bfe2 -s ours
am skip reason: change_id I93a0a624304b9f6f00aae600377a73b720900fba with SHA1 f293278fff is in history

Change-Id: Ib8f39221d399d469172677fae1875dc5064f7436