Merge "Allow lazy HAL to run" am: b6388fe753
am: a8ee48d499

Change-Id: I73dd57b44e1d6f6166d36d754613c93e5f3c5a73