Merge "Add NOT_AVAILABLE_POOR_VISIBILITY to ErrorState in HAL"