When a failure occurs while creating a device attribute, we need to remove previously created attributes prior to deleting the disk. (cherry picked from commit 8d006d3f139c46beaeee138bda9d0807185661a9) Change-Id: Ic5ebba9c06f3811534f5b5e8c0399809e5dc9f23 Signed-off-by: Maya Erez <merez@codeaurora.org> (cherry picked from commit 7256cdc299a4d42c1d316afbac98d320154ce6da)