Merge "Make health storage HAL lazy" am: 063024b1b6
am: 6afe6b9ca6

Change-Id: Ic5ef6e8df946d19b5c47f8ee822adc6d199487f4