Minor fix in change password boot from volume

Change-Id: Id518f00a1759a3179ad473fe1d373b86db3792b8
Merge "Minor fix in change password boot from volume"