Fixed boot issue

Change-Id: I5ca0b17486930c94c40db8df829a2a6c51b36caf