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

Change-Id: I8eea682dec3eba70a2d44c32ba6e28641118300a