Merge "Allow StubVolume to be browseable in Settings" am: 8f516adef7 am: e613923d66
am: 1670c69b7c

Change-Id: Id567d995f6f25a46225a2080609048051cca2337