Allow fixing race condition in lazy HAL.
am: 573e532a30

Change-Id: I35ba668a7dffb075a419f72011f381a65e239e28