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

Change-Id: If57158811efac1f9559d1b6b264789ad651211c7