Move system unmount out of if statement

Change-Id: Ifeada4ccf047ac05956ab0574e97fbba1daf73d0